From c1ac5284f0265b5ab48f917658d7989e0a585a59 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 27 Mar 2013 09:21:43 +0200 Subject: [PATCH] Fix compilation of addpm with MinGW64. nt/addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard headers, since that's where _W64 is declared by MinGW64. --- nt/ChangeLog | 5 +++++ nt/addpm.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 33352c52aa4..e853e5b82f3 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2013-03-27 Eli Zaretskii + + * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard + headers, since that's where _W64 is declared by MinGW64. + 2013-03-26 Eli Zaretskii * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define. diff --git a/nt/addpm.c b/nt/addpm.c index 8079d51dd64..688e0167334 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -34,6 +34,10 @@ along with GNU Emacs. If not, see . */ installed, then the DDE fallback for creating icons the Windows 3.1 progman way will be used instead, but that is prone to lockups caused by other applications not servicing their message queues. */ +#include +#include +#include + /* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything below 0x500. */ #ifndef _W64 @@ -45,9 +49,6 @@ along with GNU Emacs. If not, see . */ #include #include #include -#include -#include -#include HDDEDATA CALLBACK DdeCallback (UINT uType, UINT uFmt, HCONV hconv, -- 2.30.2